* xrdb.c (get_user_db): Get the screen-specific database too.

diff --git a/src/xrdb.c b/src/xrdb.c
index 19ca21f9e02d00c10fd911f802a44697ad59ed88..6a769e3aa6c67b7278c3fc823d20c97711f3ac3d 100644 (file)
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -314,6 +314,15 @@ get_user_db (display)
       db = XrmGetFileDatabase (xdefault);
     }
 
+#ifdef XlibSpecificationRelease
+#if XlibSpecificationRelease >= 5
+  /* Get the screen-specific resources too.  */
+  xdefs = XScreenResourceString (DefaultScreenOfDisplay (display));
+  if (xdefs != NULL)
+    XrmMergeDatabases (XrmGetStringDatabase (xdefs), &db);
+#endif
+#endif
+
   return db;
 }